Skip to content

MAPL3 compatibility#3277

Merged
yantosca merged 11 commits into
dev/14.8.0from
feature/mapl3
May 19, 2026
Merged

MAPL3 compatibility#3277
yantosca merged 11 commits into
dev/14.8.0from
feature/mapl3

Conversation

@lizziel

@lizziel lizziel commented Apr 17, 2026

Copy link
Copy Markdown
Contributor

Name and Institution (Required)

Name: Lizzie Lundgren
Institution: Harvard University

Describe the update

This is a no diff update to bring in code for use with MAPL3. MAPL3 is not currently supported in GCHP and is still in development. All code for use with MAPL3 are in C-preprocessor blocks #ifdef MAPL3. When using GCHP none of this code will be compiled. Code in the Interfaces/GEOS directory are not yet updated for MAPL3.

Also in this commit are some minor cleanups of the existing code, including replacing C-processor switch ifdef ESMF_ with ifdef MAPL_ESMF, ifdef MODEL_GCHPCTM with ifdef MODEL_GCHP, and ifdef MODEL_GCHP && MODEL_GEOS with ifdef MAPL_ESMF.

This update goes with geoschem/GCHP#550.

Expected changes

This is a no diff update for both GC-Classic and GCHP.

Reference(s)

None

Related Github Issue

None

@lizziel lizziel self-assigned this Apr 17, 2026
@lizziel lizziel added category: Feature Request New feature or request topic: GCHP Only Related to items that only affect GCHP never stale Never label this issue as stale topic: Structural Modifications Related to GEOS-Chem structural modifications (as opposed to scientific updates) labels Apr 17, 2026
lizziel added 2 commits May 7, 2026 11:44
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
lizziel added 2 commits May 11, 2026 12:15
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
@lizziel lizziel changed the base branch from main to dev/14.8.0 May 12, 2026 14:57
@yantosca yantosca added this to the 14.8.0 milestone May 12, 2026
lizziel added 6 commits May 14, 2026 11:10
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
…tion

Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Previously USE_ESMF was used as a proxy for using a GCM or GCHP.

Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
@lizziel lizziel marked this pull request as ready for review May 15, 2026 15:24
@lizziel lizziel requested a review from yantosca May 15, 2026 15:24

@yantosca yantosca left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @lizziel. I just caught a couple of typos but overall this looks good.

Comment thread Headers/errcode_mod.F90 Outdated
Comment thread History/history_mod.F90 Outdated
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
@yantosca yantosca self-requested a review May 18, 2026 21:21

@yantosca yantosca left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good to merge now, thanks @lizziel!

@yantosca

Copy link
Copy Markdown
Contributor

All GEOS-Chem Classic integration tests passed except APM:

==============================================================================
GEOS-Chem Classic: Execution Test Results

CodeDir   : 9945dbc GEOS-Chem update: Merge PR #3303 (GCHP rundir improvements)
GEOS-Chem : 2cc2774bc Merge PR #3303 (GCHP run directory improvements)
HEMCO     : 5f9e8a3 Merge PR #360 (Build-time option for MAPL3 compatibility)
Cloud-J   : 16d18b0 Merge PR #34 (Fixed issues in format statements for verbose output)
HETP      : df2f942 Merge PR #4 (Multiphase aerosol chemistry, cf Travis et al 2025)

Using 24 OpenMP threads
Number of execution tests: 38

Submitted as SLURM job: 13704344
==============================================================================

gc_4x5_merra2_fullchem_APM..........................Execute Simulation....FAIL

Summary of test results:
------------------------------------------------------------------------------
Execution tests passed: 37
Execution tests failed: 1
Execution tests not yet completed: 0

All GEOS-Chem Classic tests were zero-diff w/r/t gcc.14.8.0-alpha.9, except

  • gc_4x5_47L_merra2_fullchem_APM
    • Test failed
  • gc_4x5_47L_merra2_fullchem_TOMAS15
    • Numerical noise differences observed in TOMAS species. Maybe due to a parallelization error?

All GCHP integration tests passed:

==============================================================================
GCHP: Execution Test Results

CodeDir       : 6df92fe GEOS-Chem update: Merge PR #3303 (GCHP rundir improvements)
MAPL          : 092f62d9 Merge PR #44 (Update MAPL from 2.59 to 2.69.0)
GMAO_Shared   : 4ddb3ec Merge pull request #2 from geoschem/feature/mapl-upgrade
ESMA_cmake    : 01bbf2f Merge pull request #9 from geoschem/feature/turn_off_f2py_builds_in_gchp
FMS           : 259759d1 Merge pull request #3 from geoschem/feature/update_gmao_libs
FVdycoreCubed : 348620f Merge PR #11 (Scale tracers by pressure ratio in first timestep)
geos-chem     : 2cc2774bc Merge PR #3303 (GCHP run directory improvements)
HEMCO         : 5f9e8a3 Merge PR #360 (Build-time option for MAPL3 compatibility)
Cloud-J       : 16d18b0 Merge PR #34 (Fixed issues in format statements for verbose output)
HETP          : df2f942 Merge PR #4 (Multiphase aerosol chemistry, cf Travis et al 2025)
GFE           : bac529f Merge pull request #40 from Goddard-Fortran-Ecosystem/feature/mathomp4/update-gftl-1.15.2

Number of execution tests: 12

Submitted as SLURM job: 13704448
==============================================================================

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%  All execution tests passed!  %%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

All GCHP tests showed differences in the diagnostic files created by the MAPL HISTORY component due to metadata updates in MAPL v2.59. But restart files are all identical.

@yantosca yantosca merged commit 9ea5acf into dev/14.8.0 May 19, 2026
@yantosca yantosca deleted the feature/mapl3 branch May 19, 2026 14:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

category: Feature Request New feature or request never stale Never label this issue as stale topic: GCHP Only Related to items that only affect GCHP topic: Structural Modifications Related to GEOS-Chem structural modifications (as opposed to scientific updates)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants